Refactor - add eq? and rename eqv to eqv?