Change structure of code..