Remove unncessary Comparator object. Rename variables to Camel case.