Issue #3514185 Resolve issues with code comments discovered by the PHPCS test in our gitlab CI integration. Improve code comments.
Closes #3514185