Remove ComparableComparator class and do code refactoring