Reordered variables to make Json more readable