cleanup PHPDocs, give some methods protected visibility