Clean up of the timer code
Reduce number of possible floating point operations