Restructure
Array variable instead of all the variables