minore code cleanup

Change-Id: I64f34a43517b4aaacbc47063c9b95eb63c549fd9