Further cosmetic reorganization