continue refactory.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>