ref #4232 refactoring for comparator