Refactored battle arena