Slight reordering and sectioning.