Cleanup.
Drain => DefaultDrain.
Refactor timer.
Better tests for Timer.
Merge pull request #3 from remind101/cleanup

Cleanup