style refactoring 3