Refactoring day 1