MAINT: various clean-ups in prep for review