clangify

Change-Id: Id6cee76fb66727d6403a1f92e0d4cbd9d3621fd4