Refactor comparison expression

As discussed - proposition of refactoring Comparison class.