Applied Patch to fix coding standards