More coding standards tweaks