refactoring. day 2