Tidy up imports a bit