Tidying up with drupal coding standards.