minor cleanup following last two commits