tidied map refs