subtle refactoring