Comparator: Code cleanup