Changing indentation and order of stuff

Just for diff, do not merge