Improve PHPDoc.
Reduce nested blocks in methods