Formatting cleanup

Feel free to discard this pull request, but the inconsistent spacing, mixing of tabs and spaces, etc. were too distracting to me as I was trying to debug a separate issue. Personal preference is not to use ASI, nor prefixed comma and since it was a mix already… well, that's how it ended up.

No hurt feelings if you discard ;)