Make comparator more explicit