ACalc: Code cleanup.