Factored out common find code methods. Some code amendments follow code review