a few more small cleanups