a few cleanups