cleaned Save()