Some import tidying