Tidy up in section 7

Fixes #465