refactored module imports