Make the imports sense
Merge pull request #129 from square/blom/make-clear

Make the imports sense