explicit returns in guide function
Minor style tweak and refactor
Merge pull request #323 from warpling/search-results

Search results: minor fixes