modify style
refactoring