fix and simplify the data stored from custodian