Feature/drupalcs

Drupal coding standards, no functionality changes.