codestyle fixes
phpdoc fixes
task rename