PSR2, couple more PHPDocs