slight code cleaning, sheathing weapons