Fix the Coding Standard issues in the module