Refactor and more translation.