I have refactored the code again with same method and solved the issues previously arising

Comment From: snicoll

and solved the issues previously arising

Sorry, what do you mean?

Comment From: snicoll

I am afraid this is in the same state as previously discussed in #31692. If you want to contribute, then please avoid making stylistic change and focus on one contribution at a time.