Fix PHPDoc & coding style