Small cleanups

Cleaned up imports, and other small fixes.
Merge pull request #1 from kmonson/master

Small cleanups from Kyle