Cleanup trailing whitespace

There's a lot of trailing whitespace left around, this just cleans up a bit.