refactor to remove redundant components, replace with single tranlsation
component