modified syntax checking to more closely match styleguide.