Uh, oops. Forgot to save.
Small changes, mostly indenting and whitespace.