Cleaning up -- renaming things -- adding a list of running timers