small code reorganization