More cosmetic reorganization