Some Coding Standard tweaks