Nitpicking the code

Minor changes here and there to remove warnings and make code cleaner and more uniform.
Does inheritDoc work here? or do we need to do ``@see Object#equals(Object)``?