Code now according to Drupal standard