Improve phpdoc blocks