Refactor BattleModel
Minor tweak in BattleView