elmamun transformed and some cleanup