Possible fix for #22 - Tidy up imports.