Some cleanup + Start of dialog inheritance