small cleanups and polish