Refactored Comparators