Back out complexity, no need.  Add HTML lint.  Fix all issues from HTML lint