Adrin and Jon stood, pistols in hand and swords at the ready as they faced the last of the Sticks.
Jon and Adrin had both guns and swords.
I don't think changing it would be a good idea, since it would upset more people.