CMS-1460 : Configuration and code style