Pretty print of saved XML files - Fix IssueId #423