Fun with Refactoring 1