Cleanup of translation method :lipstick: