more restructuring and addressing Suzanne's comments