Refactoring style and html