Updates and tidies, following PR review