change some functions' name, and fix for beauty