Improved adherence to Drupal coding standards