some more refactoring. fixed incorrect imports