Made comparators variadic and reorganized