small cleanups
small cleanups