CMS - code  styling revision & improvement