Whitespace
Whitespace
Whitespace
Style and whitespace
Merge pull request #4 from sodabrew/small_cleanups_2

Small cleanups 2