Change underscores to spaces and cleanup of json