tidy up imports and other stuff