#32 cleaned up WidgetImpl