very small cleanups