Style restructure