Comments more align with Drupal standards