Code cleanup for validator.w3.org issues