Cleaned up loading a save a bit more