REFACTOR TRANSLATION CONTROLLER
CATS-595