0331 - cleaned up some data structures.