Simplify data structure