SuperCalc refactor