code organization change for cosmetics to plots