more small cleanups