Adhering to Drupal coding standards and minor coding format enhancements