data_check -> payload_check and some cosmetica