scoping issue #402
cleanup