Continued cleanup/reorg