Tidying up imports