Remove commented out code and reordered variable modifiers in Calculations.