Refactor combat a bit