Simplify HTML and code