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

Remove whitespace.
Rearrange some Timer code.