day 2 the 2nd refactor