delete useless codes
modify data formatation