fix coding-convention issues.