Coding standards #507