Tidy up CMS example code