Coding standards changes, refs #51