refactor hystory and people