Refactored some of the combat chore