Revert "minor variable fixes"

This reverts commit c9f882adfd4f26c44f6be78d73c2d6a62faaeeac.