Tidied up the conversion map