Refactored character object