Update phpdoc and fix cs