small formatting, indentation and comment fixes

- contains zero code changes
Merge pull request #4170

ac14bcc small formatting, indentation and comment fixes (Philip Kaufmann)