Improve W3 Validation