Some language cleanups