Tidy up ends of chapters and remove excess subsection