style cleanup

Change-Id: Ibc7d5920e102446b331739463faf979d87ab19b2
Merge "style cleanup" into production