some more code styling fixes
DocBlock changes - "inspired" by Scrutinizer Patch