smaller cleanups