PHPDoc and code formatting changes