MAINT: some minor clean-ups