Day 3 homework refactor (to match UML)