Day 10 More Refactoring