You did it the right way. Cleanliness is next to Godliness.

Good luck with the new gun(s).

Best,
Ted