Change the code structure