Tidy up and add required brace