Make whitespace consistent
Remove unused import
Merge pull request #26 from squarejaw/master

Minor code cleanup