Cleaned up json input

I think. feels a little clunky, but what the hey