Refactoring
Fixed equals()
Static methods inlined