misc cleanups and cosmetics