Cleaned up code:  opposite findings in local v global