organized imports
cleaned up code
Merge pull request #9 from benwaffle/master

Cleaned up code