PEP-8 Refactor and Added more expansion packs.