Code clean up

Better timers
Logging no longer affects timing