Sean and Jon Refactoring Fun