just some cleanups