Changing translation approach to make the code cleaner