Cleaned up to json