SaveData: Addressed some comments