This is mostly just fixing whitespace.