MAINT: Some clean up