Beta Battles, no adding, small code restructure.