day 2 of refactoring