Add conversion from JSON to columns.
Cleanup code.