Cleanup and adds structure edit