refactor cluster finding methods, working now