few more small cleanups