Refactored module