tiny cleanups