Refactor Day 4