Update for drupal coding standards