Fixed up to Drupal Standards.