BattleSystem implementation clean up