mutt wrap and some cleanup