knn cleanup
Make KNN a little cleaner