clean up imports for package style