assorted minor whitespace changes