Refactor current_translation