Remove whitespace.
Merge pull request #166 from ahmedcharles/whitespace

Remove whitespace.
Rearrange some Timer code.
Merge pull request #159 from ahmedcharles/replay

Rearrange some Timer code.
Fix warnings.

One instance of a unnecessary switch statement.
One instance of an unreferenced parameter.