[CLEANUP] Improve the @param/@return/@var PHPDoc