Cleanup, including high_resolution_clock::now(), and add a stopwatch class.