code cleanup per parereview for Drupal standards