A little more code reorganization