Cftag mods

A few adjustments to suit our coding style.

@smebberson This is ready for review!