Refactoring: eval pairs/atoms instead of strings