Updates PHPDoc and formatting