Re the extra space before the brace - I'm not sure we're doing this consistently elsewhere.