MAINT: more clean-up in prep for review