fix coding standards issues.