cleaning up variable structure for taoti repo