Tidy up logCalculations a bit