Adding coding standards changes