HTML refactered