cleanup trailing whitespace and indentation
Merge pull request #71 from dontmitch/cleanup_code

cleanup trailing whitespace and indentation