Clean up code. Add better support for multiple timers and for stopping and starting