Refactor - Better JSON indentation