modify some code style & function