Tidied up savefile name formatting