Code formatting tweaks as per Drupal coding standards,