Code standards tweaks