Fixed PHPDoc and CS