Further refactorings of Character