Refactoring in styles, directives.