code cleanup #15

Change-Id: I80014545903604947f57efccfa1521f1be356442