Removed trailing whitespace as well as unused imports
Merge pull request #11 from alex/trailing-whitespace-unused-imports

Removed trailing whitespace as well as unused imports