Code organization, improved Stopwatch class.