Sean and Jon refactoring fun fest