HTML refactor