small cleanups & reorg