Coding Standard related changes.