Cleaning up for PR