LOW / Minor refactoring for save item