Beginning the tidy up of MenuState