a little more cleanups