Improving the PHPDocs comments