some more small cleanups