simplify comparison code
bump for refactor