INT-2856 Add comment, hashcode and some format change