Hard/AdvancedCalculator minor cleanup