Improvements to the Calculations example