refactor to use localized values