Coding standard and phpdoc fixes