some change on code style