Trailing space cleanups