Update & Organize Formats

Extended description? Umm.... I updated and organized the battle formats so that they are not terribly messy.