26/08 - Refactoring