MAINT: optimize: A little bit of spring cleaning