PHPDoc and formatter fixes