cleaned up data structures