Widget Selector 2.0 clean code