Tidy up imports

Fixes #14