Fix drupal coding standard issues
Fix drupal coding standard issues