Improve consistency of schedule
Shorten section 2.2.2 and remove TODO