Indentation and whitespace cleanup. Sorry santa, I'v been naughty :(