Refactor finder definitions