Minor format string cleanups