Data structure simplification