Tidying imports