change structure of code.