[find] small improvements, refactor, comments