[Upg] Decrease complexity
[Upg] PHPDoc
[Fix] Doc