Tidied up Singleplayer code.