whitespace characters to a single space.
Small changes elsewhere, mostly to clean up the code a little.