Code style and phpdoc fixes