More cleanup: import * only possible at module level