more find-free refactoring