MAINT: Small cleanups