Changed comparators to run by ID instead of name

Minor refactoring, moved comparator data to item class