Tidying up the imports