Minor code clean up and fix broken import paths
Merge pull request #6 from bketelsen/cleanup

Minor clean up and fix broken import paths