Move comparator to static field