Resolved coding standard issues