Fixing coding style errors following code analysis.