Character refactor done