Remove checking of null in compareTo method