Minor refactoring. Removed save override