Cleaning up mark-up to be valid HTML5 according to W3C validator