make the structure right
remove