Refactoring Day 2 Work