Code cleanup

* clean up imports
* fix spelling errors