Closing #5, improving JSON rendering