Fixing strict eql
Adding better hash check of modification object
Refactoring if statement