Refactoring styles