Cleaned up the code in the battle classes
Need to talk to Nolan about a couple of things