* Clean up code
* Added Model\Item now throws an invalid argument for invalid JSON.