update style
refactoring
refactoring 2