Added some comments, moved timings closer to the measured event