Update code to drupal coding standards