change some variables' name
refine the source code