Simplifying data structure.... here we go...