PSR2 and phpdoc fixes