Character refactoring