more style clean ups

Change-Id: If10493e5370fd99328f1a6c72347fcf5f96974e1