add simplejson
indentation fixup
more cleanup