refactor value
Minor changes