Change: Cleanup whitespace
Merge pull request #307 from nickanderson/fix_whitespace

Change: Cleanup whitespace