Refactor - Battle (partial)