minor changes to Polimorphic Calculator