code style
refactoring