Fix Coding Style issues.