Fixed most of the whitespace issues in the latest commit.