Can we refactor the names, and remove the translation and comment?