Clean up + naive binary search