MAINT: fix the function signature and implementation and some code cosmetics.
MAINT: fix the function signature and implementation and some code
cosmetics.

DO-CV/sara,DO-CV/sara,DO-CV/sara,DO-CV/sara,DO-CV/sara,DO-CV/sara