Made widgets cleaner.