Fix typo's
Simplify timer code