DRY with main.py (Also bugfix with battle)

sas