minor cleanup: include orders, end comments etc.

- no code changes