JSON successful. Merging changes
Cleaned up and formatted code