Fix typo
Refactor Comparator
Refactor Comparator