Also update some code to match coding conventions. Change-Id: I70be0e6575a20ad268fecdbc6d59ab83915c0f23