tighter json structure, cleaned out old cruft

cruft cruft, everywhere I look there is old cruft. ugh.