Tidying up the code for combat sounds