Refactor HTML5