modify the name of function and some indent