Tidying up imports, etc.