Use Comparator instead of Ordering

lower object creation costs