Code and phpdoc clean