Clean up code-V1.0

Signed-off-by: Hui Zheng <fengyimzy@gmail.com>