Drupal coding standard cleanup