Fun with Less Refactoring