Simpliefied the generated HTML.