Minor editing cleanups