Change name of field

Needs to be different from containing class
Remove useless parenthesis
Remove magic numbers
Use ApacheCommons Equals and Hash builder