Refactoring day 2