DocBlock cleanup
Ran PHP CS fixer
Merge remote-tracking branch 'origin/docblock-cleanup'