refactoring style