Minor import refactoring