various heading and PSR-2 compliance edits