code style refactoring
refactoring