Moved params inside DBSCAN and small clean