Refactoring to use dataRow dataField method