My OCD kicked in and cleaned up the imports a bit
Merge pull request #3 from creiht/master

My OCD kicked in and cleaned up the imports a bit