small headers ordering cleanup

- keep headers in alphabetical order
- remove some spaces etc.