Fix: patch docblocks as suggested by PHP Analyzer
Fix: address issues identified by PHP Analyzer