code cleanup #15

Change-Id: I5227cf76ceff900cb402f08dffbf682b326d2926