[TASK] Clean-up several whitespaces and PHPdoc comments