comments, cleanup, slight reorg