Did some cleanup in modCombat

Bit of cleanup and marking scripts.