Better handling of the request than core

Sort of, better formed to deal with specifics of JSON. Also whitespace
fixes because: "Come on Brackets!"