Some minor reformatting, and switch to Windows line-endings (boo).