Remove the useless code
Rename the structure and its member