Refactored characters