More phpdoc cleanup