codestyle and phpdoc fixes