Improved calc formatter to be able to calculate using multiple numeric properties on a single model