cleanup search
Merge pull request #1 from rubenesc/refactor_search

cleanup search