minor import refactoring for cleanliness