Minor cleanup of these sections