refactor saver