CFG:U: Addressed some style issues