updating data structures with a more organized feel