Cleaned up some comments and class definitions.
Correcting a minor static function issue.