Codereview and cleanup.

Used sublime with PHPCodeSniffer and Drupal Std.