Fun with Refactoring