Fix equals and hashCode
Remove unnecessary semicolon
Remove redundant toString() calls