Coding standards improvements