some trivial cleanups