style refactoring