[refactor][clean up]