MAINT: pep8 fixes
MAINT: pep8 fixes
MAINT: added caching of values for consistency with other fns