a little more scope cleanup