More whitespace, readability, and formatting changes