Refactored for Brightness/Contrast controls