small cleanup - (to be squashed before I commit to trunk)