cleanup code for PR