use electrical contact cleaner, take the switch housing loose from the handlebar so you can see inside to spray it while working the switch back and forth, WD-40 is a water dispersant not a cleaner or a lube, graphite conducts electricity, it would short out the switch contacts to each other...