Refactor translation component