Tidying up of imports