more refactoring, mostly imports