cleanup: hidden functions to _function and removed unnecessary function