refactoring, cleaned up imports