tidy up from review=