Little code reorganization