updated cs (do not use multi constant/property definitions)
updated cs (always use braces for control structures)