Class cleanup, PHPDoc, etc.