- Refactored module to understand what's going on;