#19 - refactoring in Search to improve readability.