Make code complient with WC3 standards