Refactoring day 4