Feature/refactor character list