Fixing pull#3 coding standards violations.