savegame: maor refactoring