Level 2.5 - Refactor