Refactor translation module