Refactor translations