even more tidy up html5 markup