Coding standards tweaks