Save. More refactorizations.