more trailing whitespace fiddling