A few text cleanups