Refactor - character