Character refactoring, create a class for each Character
Bug fix