Made the data structure easier to work with