22/10 - Refactoring