Changes to files based on review by Drupal Coder and PHP Code Sniffer