refactor payload normalize