BattleEngine: Small Clean Up