Cleaned up Json