Simplify data structure to be more efficient
0.9.1