Cleanup

Mostly adding whitespace for readability.

Also fixed some comments and removed unused code.
Merge pull request #22 from amire80/code_cleanup

Cleanup