Style review

Change-Id: I4729afb0b2a0950ee4733eae796e2fe4dd018800