Simplifying data wrangling step