cleaned up some shadow variable warnings.