Cleaning up some code reorg a bit more