Refactoring + style integration