Coding standard improvements