Refactoring of Character.cs