Adding some comments
Slight optimization to store the string names instead to avoid repeated demangling