Minor import reorganization