Refactoring clsWidgets.inc