tidying up imports