Move stopwatch logging elsewhere