Cleanup/reorg, including comments, varnames.