Replace comparator with comparable implementation