improve incoming data parsing