Coding standards changes