code cleaning and update request json version