Refactoring a bit SaveHandler