grammar cleanups