Removed unused local `id`
Fixed editing problem