more import refactoring