Finish the refactoring for Json.
Reindent