Coding conventions tweaks