listValues() refactoring