change structure of code