Cleanup trailing whitespace in a few places