Expand search range for k-NN and Tree
Cleanup utils.py