cleanup: comments and imports
Merge pull request #12 from pkit/devel

cleanup: comments and imports