Pr comments corrections (phpdoc issues)