Subtle refactoring