tidied all mappings