simplify data structures (work in progress)