few cleanups