a few small cleanups