payload minor refactor