Fix of phpdoc and code style