More whitespace changes. Thanks to Ben for pointing out prior errors.