Refactor

name the function, directly export