cleanup and organization of imports
Merge pull request #170 from gubatron/master

cleanup and organization of imports