Coding guidelines changes