Another small code reorganization