General OCD Attack cleanup, also made eclipse generate the equals method 

Signed-off-by: captain_shadows <captain_shadows@aol.com>