General code cleanup.

There were a few places using spaces as indentions, and a few other minor things.