Rationalise redundant variables.

Pull 'timeDiff' into 'util' package