minor clean ups

Change-Id: Id2ac87726a6ce895602636c52017eb2b1835727c