Tidy up mapping.