[TASK] Clean-up PHPdoc comments