phpdoc and code cleaning