change internal code structure to create dedicated operators : smartness is no more on calculator only