Whitespace wrapping fixes

These are just minor whitespace figures, but they should make the code a little easier to review