reordered a couple of things
1 file changed