Fixing coding standards violations.