more restructuring
cosmetics