cleanup
Add comparators