ModelWidget class refactoring done.