Modify code structure