Astetic changes.

Mostly whitespace, some comment fixes and a little renaming.