Brush up source file for 2.0.0
Correct some my mistake...