comment blocks, clean/reorg