Changing code structure