Refactor HTML