Rearranging data to make my life easier