Cleanup
Merge pull request #40 from boneill42/master

Formatting and Cleanup of Imports.