Minor code cleanup

Change-Id: Id425b316617c38c19f2d10d23d41814a71215a60