Refactoring for giggles