Calculator - bug fixing, beautified