refactor single values