Cleanup in hashCode and equals in PartialState
Minor changes and updates to code