Tidied up MapState a bit