Cleaning up the imports a bit and fixing GH #60