Timer class.  Cleanup code