clean up trailing whitespace
clean up require/import
Merge pull request #2 from jschwab/master

Miscellaneous Code Cleanup