create internal func and put in relevant funcs

create internal func and put in relevant funcs #390