Minor changes (took out comparator, it is unused)