Small formatting cleanup

- Imports grouped and ordered in the conventional (goimports) way
- Trailing whitespace removed