Removing Uneccessary context from PaceCalculator