Whitespace cleanup

Cleaning up the source code.  Once this is merged, I'll be able to submit further code changes.

It would be great if every other commit didn't create such a mess.  It'd be much easier to validate and accept changes, and thus stay sync'd with this repository.

Thanks for the consideration.