Changes to follow syntax rules.