improve API get rid of extra junk