Added JSON + CMD Arguments cosmetics