lcheng59 jcheng26: Minor refactor to setting up battle actvity