Refactoring of PHPDOC