tidy up of stopwatch