Some refactoring to use underscore in finder/getter local functions