Created a CharacterFactory, and made some smaller changes.