Fixing coding standard issues.