Made code w3c conform