Added JSON formatting shortcut
Minor changes