Fixing coding standard violations