Refactoring to drupal coding convensions