data process update and some cleaning