tidy up for PR