DocBlock headers - fix mismatches with code and apply consistent formatting