My OCD had to standardize the whitespace in this file :)  I found the most common pattern and made non-conforming whitespace match.  There is a separate commit for this as well...