#19 - refactoring in Search to improve readability, part2.