add json package
cleanup