ocd

A few miscellaneous cleanup things. Whitespace, code after return, etc.
Merge pull request #22 from sphia/misc-cleanup

ocd