Coding standard changes