style refactoring 2