some small cleanups