major style restructure