Replaced all use of internal dict with direct names.