More refactoring of Characters