First round of cleanup based on W3 markup validation