code style refactoring