cleanup in prep for PR