Style and phpdoc fixes