Small refactor and cleanup
Fixed equality matchers