Started W3 Validation tidy-up