clean-up and more translation methods