Calculator - small changes