Drupal Coding standards fixes