Refactoring HTML