Small commit following some review comments from Dave E