refactor citizens