Clean up
Handle empty JSON, more specs