Minor code cleanup

Change-Id: Iedfa189615a2c16cd2c9d1801067acd3e6424347