More style and phpdoc fixes