Restructure
Minor fix