Cleanups
Improve the search