Yes, I've taken this into account.
Some numbers to put it in perspective:
Each year in the US:
About 1000 people die in mass shootings.
About 20,000 people die in homicide, including cop shootings. Mostly Black. About half by gun.
About 50,000 die by suicide. Mostly white men. Mostly by gun.
Suicide eclipses all other gun death, and it's not particularly close. The most common US gun death, is white male, self-inflicted, legal gun. 😢