Improved variable names in search.py
Minor PEP8 fixes.