Cleaned the save result mechanism