Improve equality section