Resolved coding standard violations