Made a couple of tweaks to ensure that the code validates correctly.