Brightness Switcher

Code cleanup.