Parallelizing searches
Cleaning code