cleaning up the widget class;)