Refactored Battle a little