cleanup source

* organize imports
* remove unused imports
* trim whitespace