add some code style refactoring