further dry'ing of comparator classes