29/10 - Refactoring