Little bit of cleanup, tightened up the timings