Fun with Refactoring 2