Character refactor completed