random small cleanups