Nozomi: adjust brightness

and a beat cleanup and consistent changes

Change-Id: I82c68cee9e3238402d6fdbbc5d6e6ada1b2eddd5