change code style and fit new base ver 0.0.1